Relax header validation for SIP. #925
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 5f4c748 The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR 💥 An error occurred when fetching the changed packages and changesets in this PR |
dennwc
force-pushed
the
sip-headers-relax
branch
from
111a120 to
c6d94e6
Compare
kuba--
reviewed
Dec 17, 2024
livekit/sip.go
Outdated
Comment on lines
109
to
110
| if strings.ContainsFunc(header, func(r rune) bool { | ||
| if r >= 'a' && r <= 'z' { | ||
| return false | ||
| } else if r >= 'A' && r <= 'Z' { | ||
| return false | ||
| } else if r >= '0' && r <= '9' { | ||
| return false | ||
| } | ||
| switch r { | ||
| case '-': | ||
| return false | ||
| } | ||
| return true | ||
| }) { | ||
| return fmt.Errorf("invalid header name: %q", header) |
There was a problem hiding this comment.
Can we replace it by sth. like:
if !regexp.MustCompile(`^[a-zA-Z0-9\-]*$`).MatchString(header) {
return fmt.Errorf("invalid header name: %q", header)
}
There was a problem hiding this comment.
btw. I suppose the number full of - (e.g. -------) is also incorrect
There was a problem hiding this comment.
Done, switched to regexp. Full header validation is out of scope - SIP itself will drop invalid headers during parsing. This is just a best-effort validation to prevent typos.
dennwc
force-pushed
the
sip-headers-relax
branch
from
c6d94e6 to
5f4c748
Compare
davidzhao
approved these changes
Dec 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since #920 is merged, we now allow mapping any SIP headers to attributes. Thus, do not enforce
headers_to_attributesmap to only containX-*headers. While at it - properly validate header names.